REMOVED: unneeded check