Rid of shell refs