code cleanup subscription updates
Merge branch 'API-returns'