Removed added files. More method refactoring.