Got rid of the old Destination class and some dead methods