Removed things that shouldn't have been there