Moving back some changes
Cleaning up extra bit