Merge "Remove controller definitions from code"