Remove dependency on ano/common