Feature cleanup

Begin cleanup, do not delete the branch