Remove PAR/GRAN code from the storage manager