Cleanup onSignChange and remove obselete import