Remove legacy code and config left by integration-tests