JARVIS-338 JARVIS-359 Removed AH references and deps. Before switch to routes.