Removed irrelevant steps, fixed resource repository context builder service