removing backbone shim stuff
merge conflict stuff