Cleaning up for master merge