removing incompilable remnant methods
Merge branch 'move-to-singletons-fix' into requirejs