Remove unneccessary event code and fix header