drop some unnecessary code