Deleted a bunch of obsolote stuff