More work in removing dead weight