Deleted unnecessary includes and cleaned up.