performing code cleanup