cleanup

Removed custom events