Cleaning up some useless stuff