Remove dependencies on controller APIs