Some future clean up is in order...