Commencing code cleanup