Unnessecary header files removed