Removing solution and project files that will break when merges happen