Clean up order of events