clean up const_step_range
cleanup unused files and correct headers