Preparing project merge - removing outdated codebase