Removed all the post AoS gubbins from OnHit