Code cleanup before refactor to UUID system