Cleans up some obsolete stuff