merge derp/cleanup