upgrade to middleman
more cleanup