Some cleanup
includes files now supported
Removed todo