Clean up unnecesarry registers and states after savagery