project/code cleanup