Remove includes
Cleanup code