Clean-up; remove unnecessary code