Switch over to backbone, cleanup