Pure code cleanup