Cleaned up from last SVN build