Clean up personal helper and controller
Solve merge conflict