Cleanup initial hover code