Removed control resource resolution stuff: contain