Clean up
Update Parser, Editor, Email Entity