Cleanup for master branch