Remove stupid on-hit code