Code cleanup 1