tidy up - untested stuff