cleanup, refactor #remove_constant