Deleted legacy code