First stage of code cleanup