further cleaned up cloud storage main table