fix scheduled task so that it runs for all tenants
clean up proposal model no logical changes