Removed more unwanted stuff