More cleanup for backbone version