Removed some old leftovers