Clean up derp code