One more commit! Removal of unused files and some more commect work