some cleanup
start on new version of blakers-massey