remove shelf before attempting to vendor to it
use ||= instead of unless block for assignment