Removed unwanted stuff