Remove unneeded files from repo
More refactorings