cleanup and fixup master branch