removed unused code, added comments, cleanup
removing unused imports
fixed bug where --include removes prefix and colon