Removed old leftovers