herp derp cleanup