Cleaned up some unwanted stuff