Little refactoring. Deleted unused files