Storage space reduction

Other Degoo issues: