Removed redundant includes

Still need some cleanup in the includes