removed some unwanted stuff