Remove unneeded includes and imports
0.3.0