Clean up on master branch