style
code chore, style

fix possible bug with putting block in place of active block without
unregistering old block