Deleted the old mapper stuff