Move to singletons fix

The methods on class side weren't deleted (just instance-side ones were added).
Without class-side methods, amberc wasn't working again, so a fix there, too.