Merge "Clean up A1 controller code"