cleanup from osx branch merge