Clean up, use backbone View events