Remove unnecessary ensureAvailable methods