Clear out some of the includes files
Remove unused layouts