Cleanup old leftovers from previous design.