Cleanup standalone registration code