Code cleanup
Removed some files
Added place holder