Clean unnecessary code