Removed some old cruft