First phase of code cleanup