Cleanup needed maybe.

Door Derp