cleanup after master merge