Drop some unnecessary code