cleanup events
remove unused prepare event
Merge pull request #71 from TheSwanFactory/minor-cleanup

Minor cleanup