Rename done + zombie code cleanup