removed unnecessary includes and typedefs