repo/code cleanup