Cleaning up some stuff

Check Back Later