Housecleaning after restructure