removed unwanted stuff