Move handlers and clean up