Clean up store scope handling in back end controller