Cleaned up incorrectly merged code due to failed svn merge