cleaning up branch, removing small-prototype code