Cleaned up and removed some dumb extraneous bloat from the editor
listener/verifier system