post-hackathon cleanup.
more cleanup