fixed derp and cleanup