more cleanup and restricted storage to max