Content Clean-up

Storage Optimisation