cleanup on "master" branch