Cleanup, register semantics change