remove manual plumbing of resources