Removed unused events
Removed pre ship event
Merge pull request #1590 from umpirsky/fix/finite-cleanup

Finite cleanup