cleaning up after design change in "Code"