Removed old leftovers.