remove un-needed includes
add gears