removing the class-side methods
fix amberc
removing incompilable remnant methods
Merge pull request #591 from herby/move-to-singletons-fix

Move to singletons fix