Includes cleanup
Remove unused files