Removed extraneous #includes