More clean up. less magic.