Remove deprecated "register" usages
Cleanup, remove dead code