cleaning up prior to master merge